From ca2570b805c06fa70a3fdc3492bf0ef04060c349 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 7 Dec 2010 18:32:04 +0000 Subject: [PATCH] x86: remove BUG_ON() from QUIRK_IOAPIC_*_REGSEL handler Since (non-pvops, 32-bit only up to 2.6.27) Linux would report "BAD" unconditionally on all SiS chipset versions (it only looks for a PCI device at 0000:00:00.0 with SiS as the vendor), we must not crash if the report on a 64-bit hypervisor doesn't match the #define (which is zero). While we could honor the quirk indication even on 64-bit, it doesn't seem worthwhile, as there's no evidence that newer SiS chipsets (supporting 64-bit CPUs) are actually affected. This should also address bug 1687 (mis-reported, however, afaict). Signed-off-by: Jan Beulich --- xen/arch/x86/platform_hypercall.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index 4dd6a6f959..0226c7c408 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -198,7 +198,10 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op) dprintk(XENLOG_INFO, "Domain 0 says that IO-APIC REGSEL is %s\n", sis_apic_bug ? "bad" : "good"); #else - BUG_ON(sis_apic_bug != (quirk_id == QUIRK_IOAPIC_BAD_REGSEL)); + if ( sis_apic_bug != (quirk_id == QUIRK_IOAPIC_BAD_REGSEL) ) + dprintk(XENLOG_WARNING, + "Domain 0 thinks that IO-APIC REGSEL is %s\n", + sis_apic_bug ? "good" : "bad"); #endif break; default: -- 2.30.2